-
Notifications
You must be signed in to change notification settings - Fork 668
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Chore: Merge master to develop #4946
Conversation
[CI] 4746 - Avoid extraneous CI runs (master)
- removed the step to , defaulting to repo root
Adding 2.5.0.0.4 to the changelog
Fix/signer slot count
…lot-count Revert "Fix/signer slot count"
Fix/signer-slot-count
…onical-2.5.0.0.4 Fix: never consider Stacks chain tips that are not on the canonical burn chain #4886
Fix: signer slots count in staging
* cow/arcing tuple types and refactoring some checks in analyzer
Performance improvements in Clarity analysis
Add PR's to the changelog for 2.5.0.0.4
* master: remove paths-ignore 4746 - avoid extra ci runs
….0.4 Merge branch release/2.5.0.0.4 to master
…y-retry Set default antientropy_retry to one hour
…y-retry 2.5.0.0.5 changelog
hmm, master could use a merge from better to wait on this PR until that one is merged? |
Yep, happy to wait on that. Will close. |
…5568 merge release/2.5.0.0.5 to master
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
This merges the latest from master to develop. The conflicts were in
CHANGELOG.md
, and in commented out code inv1::signer